[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT MERGE
am: fa18597e5e  -s ours

Change-Id: I2ed30daf47c20b3896e50f5abf82a72e7ec99d55
tree: a9227bd621b872273bc72635f743dd2ac2cddebd
  1. tests/