Bug: 74010481 Test: None Change-Id: I63ad4c834e38a718cf444ebc544ee3cb5f38c09d (cherry picked from commit 1c0e3451)