Bug: 337154438 Test: Manual test Test: Build pass Change-Id: I530c554433d99b4732416b8f1b83677ddc0ff6d8