Manual merge from cupcake_dcm. internal CL#148693. Two donottranslate.xml-s are already submitted.
1 file changed