am e870f7df: Reconcile with jb-release

* commit 'e870f7dfeae928f61bb57a62685199cab41bcdc4':