[gn build] Merge r349167
1 file changed