Reconcile with jb-mr2-release - do not merge

Change-Id: Ia17841b4d49f0fe09e1034ff0b28efe55947f03a