Merge "Fix Automated API Review issues."
tree: 5233a7cfa9d8ebdb1e05bfccf0bcdf4c5a0d9cb7
  1. core/
  2. services/
  3. tests/