am a8c57e11: am b69b416c: am 17876646: am 218ea026: Reconcile with jb-release

* commit 'a8c57e1172dd6a7184d7c2883879730e48654318':