Reconcile with jb-mr2-release - do not merge

Change-Id: I56c9305bd508afe439e38c7a05aa4b9139ed28f1