Bug: 13807256 Cherry-pick from Iae4901a311e76401396f89c552e5b27a49c65c83 Change-Id: I4ad7aea1a3c7ea82bc2bbcdf35d2de418ef7b90f