Bug: 72931803 Test: Manual Change-Id: I41ac5569e97cc33c57af55a37135a3f7617a2385 (cherry picked from commit 1584fa6f)