Reconcile with jb-mr1-release - do not merge

Change-Id: Ia6cd9f9da1393801f6aeca58eafb6740bae275ca