[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: c25ddbfef4  -s ours
am: 7c34d32772  -s ours

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