Reconcile with jb-mr1-release - do not merge

Change-Id: I7653d40dbf6b2435b5681edd20cf763460422d57