Reconcile with jb-release

Change-Id: I47647e60f50f0a504a674e9fe084d9d2d2144d01