Reconcile with jb-mr1-release - do not merge

Change-Id: I907688f075794f3eb2854421f6cae592e6982398