[automerger skipped] Merge "Address leftover comments on aosp/894233" into qt-dev
am: 35d521ed42 -s ours
am skip reason: change_id Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613 with SHA1 061f7a7eef is in history

Change-Id: I6e9043be4c28b73856b72f80971e2b66f8b8926b
tree: 9c6213b1bf3a9729621cf663807dfca110ff2adc
  1. core/
  2. services/
  3. tests/