Merge of http://go/wvgerrit/78683 There were some review comments in http://go/wvgerrit/78683 that came in after the code was merged to the qt-dev branch. This CL addresses them on the master branch. Test: unit tests. Bug: 129070445