Reconcile with jb-release

Change-Id: Ic2cf7300da4e96389dd6fb0613f53b234ba14230