Reconcile with jb-mr0-release

Change-Id: I2c1e845129260c308c1c89f9ac7e0c52bdc4ef9b