Merge "Address leftover comments on 923337 and 930217."
tree: c17f1dafae69ebc2ed0af12886185cf3387381f2
  1. core/
  2. services/
  3. tests/