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

* commit 'b69b416cc2dfefc7eec5105d3e8bfa0bc58cd92b':