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