Reconcile with jb-mr1-release - do not merge

Change-Id: Ib69160e84d0803f668e62c9425a0b4e6480ab77b