am 944ea123: Merge change 2407 into donut

Merge commit '944ea123683b14225297d451c86e97fc73be3a02'

* commit '944ea123683b14225297d451c86e97fc73be3a02':
  Manual merge from cupcake_dcm.