Reconcile with jb-release

Change-Id: I2b5cf5780851a3979016a50ff39f7da6d6d1a82b