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

Change-Id: I7be693d806979993a85bfbb0e9e8740f7e8c45b4
tree: 49aaaa463e9f26a7e26f08a2fc9395188db286c2
  1. tests/