BUG: 74083361 Change-Id: Ia0750bcca2534e794a81f094d5c214af4011c0ce Test: Locally (cherry picked from commit cb45b97a)