Bug: 402672865 Test: manual test Flag: EXEMPT bugfix Change-Id: Icb80a0aec6e07578e6049ed2ff5ac159e57ca940