Reconcile with jb-mr2-release - do not merge

Change-Id: I3f33e26fcb3db081ca2b18664fdcbd859024d402