am de764172: am 4f14d40c: Reconcile with jb-release

* commit 'de764172b85e86436724a47d19f642dacf73b9fe':