am cb7b9562: am e9792f85: Reconcile with jb-release

* commit 'cb7b9562efda73b162022df58e9ca1d37f3bc25e':