Reverting checks after toArray() calls

This is needed due to revert in I7463c5c2638af53caa2e0db8723167884ab34e4a

Test: m
Bug: 202956589
Bug: 204397945
Bug: 205812471
Change-Id: I038247bd7e5077981335f441ab38875335a1149c
2 files changed