Reconcile with jb-mr1-release - do not merge

Change-Id: I0fd73e8e0b948c2d01fdb9f4c6e005ee9cd2ac44