Merge from cupcake_dcm. Should be reviewed by jackpal.
Internal issue: 1753548. CL#144715
1 file changed