Reconcile with jb-mr1-release - do not merge

Change-Id: I80d33df61bb9c1f1293c71d1d01a1e510e2ce693