[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 1f3bb73ceb  -s ours
am: b03031931a  -s ours

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