am 78d50ea7: am 587e9614: am cb7b9562: am e9792f85: Reconcile with jb-release

* commit '78d50ea7133bf68784aed92e382d897c04fa7f15':