am 27a2c849: am a21a6075: Reconcile with jb-mr1-release

* commit '27a2c8495816553cbbf120af8096b9e9f01ed11c':