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

* commit '587e96145643ba7570730080aa4fe8865df3712a':