Reconcile with jb-mr1-release - do not merge

Change-Id: I1df12b6ab7de95d59e1b66556cfb32de887de65f