Reconcile with jb-mr2-release - do not merge

Change-Id: I955b852ca6393278fc537511398e68203b9d428d