Reconcile with jb-mr2-release - do not merge

Change-Id: I3edd8a1e66ee8661e837359bee18406291ee0c25