Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE

Merged-In: I8f9b41ca6388fdeeda287e7919ef05e56f9da1a6
Change-Id: If78e130888b8d4653ef128d747e18cc46844d732
tree: 5c8d95fe6f21c171ada293529476ac332cd7acd9
  1. core/
  2. services/
  3. tests/