Reconcile with jb-release

Change-Id: I3e12054121ede80c673a8fb14e3d3a87d96b42c3