am 34416f75: Merge change 2963 into donut

Merge commit '34416f750fe2c47153bdfb8630762acecd21e524'

* commit '34416f750fe2c47153bdfb8630762acecd21e524':
  Integrate unsubmitted cupcake change 123653:
tree: 9f83def0906059fe8fdaa974498f87ab873b4b97
  1. tests/