Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I583836eeeaf604391ed9b1196d4b41e872dc635d
Change-Id: Ifd90a94f57f27c2477c0bc52efaea91870080501
tree: d19189f1aed7694e092a8ba3fc39b9aa1181f16d
  1. tests/