DO NOT MERGE - Merge Pie Bonito/Sargo into master.

Bug: 131756210
Change-Id: I77a701deda4935526ad452564f9bda77af345f46
tree: 1fd1279846d20263ace4e83115b30354ffd2a6af
  1. core/
  2. services/
  3. tests/