Merge stage-dr1-aosp-master into stage-aosp-master

Bug: 112535855
Change-Id: I1ba00379ca307f44a6430e516b474983e4c1dd32
tree: 1db33ba5ce22714ead3e6269e9cebc2037c0b10e
  1. core/
  2. services/
  3. tests/