Reconcile with jb-mr0-release - do not merge

Change-Id: Icaa1aa21771c3281f508f5c90644f4b9a97c22b9