[automerger skipped] Merge "Address leftover comments on aosp/894233" into qt-dev
am:fa6c7828b5-s ours am skip reason: change_id Idf24f42a86bbfcc89e3ea8cf50d1b705d72ac613 with SHA1ce140af98cis in history Change-Id: I6e9043be4c28b73856b72f80971e2b66f8b8926b
This commit is contained in: