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