Merge change 2408 into donut

* changes:
  Manual merge from cupcake_dcm. internal CL#148693. Two donottranslate.xml-s are already submitted.