Fixed some small changes that were brought up by CL 430679.

Change-Id: I3fca0292a1422a7e4e54f22bda90b08d2e1bffae
1 file changed