am a691d4ca: Reconcile with jb-mr0-release

* commit 'a691d4ca772292f881b3842c42ff67da88a2c7cc':