Reconcile with jb-mr1-release - do not merge

Change-Id: I4e4be8f80d48ba1fc4fc70b0c4a5dd720dbf359c