Reconcile with jb-mr1-release - do not merge

Change-Id: I1589df137a31448329a8904b6ea3a7e3442bf1ca