am a32b5f32: Merge change 2411 into donut

Merge commit 'a32b5f3252a58416f328399680395aa5fa936640'

* commit 'a32b5f3252a58416f328399680395aa5fa936640':
  Manual merge from cupcake_dcm. Need to be reviewed by enf.