Reconcile with jb-release

Change-Id: I0f90bd02e18ed8b5e8b3e2d39d6462d94969e3e4