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

Bug: 120848293
Change-Id: I2f9a524f2ba552de3f62e343075cf0abf400bbae
tree: e045c25b9e103fefc785e94406e1225a91aa9df8
  1. core/
  2. services/
  3. tests/