DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master

Bug: 120848293
Change-Id: I49bc176829a1f38eb79f28e4749785c2e9426314
tree: 399d4d1667cb4459fd936a6a1b80d2213e81dcef
  1. service-t/
  2. tests/