Reconcile with jb-mr1-release - do not merge

Change-Id: I20f10801bb78a9086a381aa1238e7cc693dd8d07