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

* commit '70a005864f6f9f82f1a0b6e7b3fcd5cec2e54fb5':