Reconcile with jb-release

Change-Id: I6c819fa5209179ee8e35edb60b3b26cc0a07a70f