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

Change-Id: I089d43355df988ed6e2b207a1b1625381fd0efc3
tree: 7422ac053c76e59d66d3ee0239ad5d2c235b325c
  1. service-t/
  2. tests/