Reconcile with jb-mr2-release - do not merge

Change-Id: Icee761e7873b6c14395d33c06ad53f5bff480839