Reconcile with jb-mr0-release - do not merge

Change-Id: I4cf69544b3cddd8558400e57aa20edca8d0b535b