[ Merge of https://go/wvgerrit/17083 ] b/27559429 Change-Id: I65a0a163e0e14bf711c257d7ab2c9486ec002c07