Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE

Merged-In: I7ef0979ffed7d218de1e68c428c97cedea180059
Change-Id: I3001b72d9f36402014c48c846b16bec6e20f126c
tree: d19189f1aed7694e092a8ba3fc39b9aa1181f16d
  1. tests/