Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
tree: 79d45bf63318c93db527e7f704a789e8c2e67bca
  1. core/
  2. services/
  3. tests/