am a90f03ea: am 587e9614: am cb7b9562: am e9792f85: Reconcile with jb-release

* commit 'a90f03ea073ec71c71fdd59ff08afe8724921d22':