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

* commit '2b26a46c20388b2b6c889477b3d40fc8170a5e7d':