Bug: 291984058 Test: builds + PC UI tests Relnote: N/A Change-Id: I157e39af045f026c889e9defc28943ec27f000e5 (cherry picked from commit 82342a8e) (cherry picked from commit f2078dce)