Reconcile with jb-mr2-release - do not merge

Change-Id: I9644ec405e9bd0ce498ab424f5f38cf2920ea1d6