Addressing the comments on the previous CL.

Test: ./scripts/run-all-tests.sh
Bug: 292141694
Change-Id: I0a1daa6d336cf80a00afeb8f067422a4baf95475