Reconcile with jb-release

Change-Id: I1ce46fa6332f684c76c276117c7b406bdd5e9336