Merge "Address leftover comments on aosp/894233" into qt-dev