am d7749390: Reconcile with jb-release

* commit 'd77493907eca9cb5ddbe4c72fd758211901f73e1':