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