Reconcile with jb-mr1-release - do not merge

Change-Id: I5bf69a6082795ba81b7c22b052f2ae10b0ed3d6f