[gn build] (manually) merge c4c3883