Merge changes  into stage-aosp-master
tree: d4fcf466b04a13a4b2f9b0dc7c60a1c45a01895d
  1. core/
  2. services/
  3. tests/