Reconcile with jb-mr1-release - do not merge

Change-Id: If02ab00e12b60a3852ec58a1f7eba47e2675da1a