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

* commit '1787664631b8fe722b7102e8dbf569b01c39aefd':