Reconcile with jb-release

Change-Id: If7cd3a5fcbf1bfaee64835c6b3ef7bf858f73b88