Reconcile with jb-mr2-release - do not merge

Change-Id: Id09bc212bd1e6901188ca5019663d19c6d9f049a