Merge remote-tracking branch 'goog/qt-gsi'

Change-Id: I3510ee0d511351112102c8f8e851097066597a4b