Bug: 262439469 Change-Id: Ida7cf2aadd190fcd582943801167eed4c535cadb Test: manual (cherry picked from commit 8f50322a) Merged-In: Ida7cf2aadd190fcd582943801167eed4c535cadb