Reconcile with jb-mr1-release - do not merge

Change-Id: Ib40f58fc6838a4be9231e221e4ba337b59bd1d3f