Fix problems with last change

I self-merged change I5cbeefb1023cf082265a832fa7b7c847c1a83308 out
of ignorance, this change will address the review from that change
and anything else that comes up.

Bug: T205644
Change-Id: I3f6039a66d4ad1f672d260b98afa8e62d4d9b51b