Reconcile with jb-mr1-release - do not merge

Change-Id: Ib703906e995f252a62d61912627b584f4ad24e63