Reconcile with jb-mr0-release

Change-Id: I5e181b92fbcc4b3d312396124a149f1c5224e55b