[ Merge of go/wvgerrit/163437 ] Bug: 253271674 Test: cdm unit tests Change-Id: I064e28af593e4a55c13d03115bb5181a879a1ed4