Reconcile with jb-mr1-release - do not merge

Change-Id: Iceb2911409f7fd9d4179c536ed05b758d91eb94a