am 479ccad3: Merge from cupcake_dcm. Should be reviewed by jackpal. Internal issue: 1753548. CL#144715

Merge commit '479ccad3431f06fa0f9ae866129e11baaa5c5306'

* commit '479ccad3431f06fa0f9ae866129e11baaa5c5306':
  Merge from cupcake_dcm. Should be reviewed by jackpal.