Reconcile with jb-mr0-release - do not merge

Change-Id: I21ed05b3d6a9679c46a8383e4d53387d16fb5708