Bug: b/321243743 Test: tested in internal main build Change-Id: I824c698587843fc72e8a16e8646262202663d99e