am 34416f75: Merge change 2963 into donut

Merge commit '34416f750fe2c47153bdfb8630762acecd21e524'

* commit '34416f750fe2c47153bdfb8630762acecd21e524':
  Integrate unsubmitted cupcake change 123653: