[ Merge of go/wvgerrit/c/cdm/+/167499 ] Bug: 249941041 Change-Id: I81ce1ecef22bd87c6d879d1ccfd6874e9786f892