Reconcile with jb-mr2-release - do not merge

Change-Id: Ic207075a312c24521c5c07441dcef63100990a6b