Reconcile with jb-release

Change-Id: I3dcf46b82ece74242207e8e3769a87dbe8f85a5f