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