[ Merge of http://go/wvgerrit/30582 ] Bug: 34285383 Test: WV unit, integration tests, cdm_feature_test.sh Change-Id: I725150a12a589144e58ab04470d50ba9317a4c46