Reconcile with jb-release

Change-Id: Iee367557b16d18b63d71c2ea910d207820643c11