Reconcile with jb-mr2-release - do not merge

Change-Id: If30a4d2103f4851f0faa1a8cf5ccf685b18e0664