am 3e4391c5: Merge change 2506 into donut

Merge commit '3e4391c54f630139ba9da3618bd45c57b4bc1997'

* commit '3e4391c54f630139ba9da3618bd45c57b4bc1997':
  Integrate unsubmitted cupcake change 131139:
tree: 5152cde99c25a9ab0ebc8bfddadb06253f042fb6
  1. tests/