Reconcile with jb-mr2-release - do not merge

Change-Id: I5556f655c440622963e3d1f89e6c8ac2bf45d53f