Bug: b/303317694 Flag: NONE Test: the new tests pass Change-Id: I5e4e9444ed63433ab6f48e0080437980b070d2f2