Reconcile with jb-mr1-release - do not merge

Change-Id: Iba7a7f1424d9b513d8553b085e8eca52023984a2