This change should resolve the build failure for ag/4013709 in master. Bug: 78908915 Bug: 78641268 Test: None Change-Id: I01dc37a90f132b9052a3ecae04d4ea09a0c78c91
dbffb1812d