Reconcile with jb-release

Change-Id: I55c12bbde76d8d105fafa27ff524bf35592465dc