am c79e59ce: Reconcile with jb-release

* commit 'c79e59ce77f30a6da1bb04773f7f63446b378d0b':