Reconcile with jb-mr1-release - do not merge

Change-Id: I682fbe3dedb67b38f2058ea2b9bfff712358466b