Reconcile with jb-mr1-release - do not merge

Change-Id: I9eea4250120e830b818a7e032bacfbc6e76f1dd2