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

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