am ff0d9147: Merge change 2766 into donut

Merge commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40'

* commit 'ff0d91479d3c8523bc290bd1b65fcd2546be1d40':
  Manually merge a few fixes from cupcake and cupcake_dcm.