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

* commit 'cb22f223b92de230711f34b086e8337e0fb791a1':