Reconcile with jb-mr2-release - do not merge

Change-Id: I5b19656a1b7b45ac21573bdbc1c8f13b22792c45