Merge ab/7061308 into stage.

Bug: 180401296
Merged-In: I4bf82035631ccff6d5a6144d6d9b1d203b076851
Change-Id: I1b5f3a672a55eaabba0f5389bab110b395553559
tree: f6f2ff9336d034733f6079704095344296103f12
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS