Reconcile with jb-mr1-release - do not merge

Change-Id: Ibdb66a3b7b73717c90a2b08f6c2d2cf6c237b8ce