[automerger skipped] Merge "Address leftover comments on aosp/894233" into...
[automerger skipped] Merge "Address leftover comments on aosp/894233" into qt-dev am: 8e3183e1 -s ours
am: 682c7134 -s ours
am skip reason: change_id Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613 with SHA1 415f523f is in history
Change-Id: I9004b0471c951fe7c64b2f384c3666f40b3360e9