Merge "Merge ab/6749736 in stage." into stage-aosp-master
tree: de11acd543ee5c4b3d77376d6b18aa95cc6d3832
  1. core/
  2. services/
  3. tests/