Reconcile with jb-mr1-release - do not merge

Change-Id: I887d27a16a0713ca92f3b2ebc570033cdb8759fb