This reverts commit 903b3025. Reason for revert: b/259899277 (missing null checks) Change-Id: Ia3a33e2d7c665b4c9d03a97545a32d378f55017b