Reconcile with jb-release

Change-Id: I2c8264a9a4e3299bca7fc01d67063993b6b1b886