Reconcile with jb-mr0-release - do not merge

Change-Id: Id285714a0d1c52c6e15356a8e9e9263061cf1846