Reconcile with jb-release

Change-Id: Idb05db9a3cd879261a0ea9ed96a433531e0441b4