Reconcile with jb-mr1-release - do not merge

Change-Id: I7aacf788266531fc9b333554cbdae78711b794f7