This is part of manual merge from cupcake_dcm to donut. Should be reviewed by mchan and takaoka. Original internal CL: 149471-p9
This is part of manual merge from cupcake_dcm to donut. Should be reviewed by mchan and takaoka. Original internal CL: 149471-p9