am a5dc519d: am 0160b3bd: Reconcile with jb-mr0-release

* commit 'a5dc519dfa9982e79a38bd215be7d39c3a8ca751':