Reconcile with jb-mr1-release - do not merge

Change-Id: I939b3c749ca86343996e1d4aefb32a7f30df037a