[automerger skipped] Merge "Address leftover comments on aosp/894233" into qt-dev
am: 8e3183e126 -s ours
am skip reason: change_id Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613 with SHA1 415f523f7c is in history

Change-Id: I6e9043be4c28b73856b72f80971e2b66f8b8926b