[gn build] merge r348505.
1 file changed