Merge "Address leftover comments on aosp/894233" into qt-dev
tree: 70df0ad4e962516fcf7312d3983c769d67419081
  1. core/
  2. services/
  3. tests/