Reconcile with jb-mr1.1-release - do not merge

Change-Id: I3041300565b33629c8d2609a75d384b731f292ce