am c715b9a4: Reconcile with jb-release

* commit 'c715b9a4ec384e813f542a003ad4e2737b86b348':