Reconcile with jb-mr2-release - do not merge

Change-Id: I0f933138aaf9f70694ef9a326c3db63770a93917