Test: Build Bug: 73659459 Change-Id: I1af2c49a937177173b760d30b030da20f03c01d7 (cherry picked from commit 7928c4d1)