am 982d3cdd: Merge change 3974 into donut

Merge commit '982d3cdd4df777b104ae683f40e8b3b67c494157'

* commit '982d3cdd4df777b104ae683f40e8b3b67c494157':
  Integrate unsubmitted cupcake change 147342:
tree: 1f592ddb5b21052b88be5caa6d7896d8271bde14
  1. tests/