Reconcile with jb-release

Change-Id: Ib78d9563e3d5d60e803eb4cc962d24480ea13595