Merge change I3632fede

* changes:
  Bug 2330278