Bug: b/291771121 Test: tested on local devices Change-Id: I1532d89ef185c584d3cc76c0541a0f47e622e3fb Merged-In: I1532d89ef185c584d3cc76c0541a0f47e622e3fb