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

Change-Id: I3fca0292a1422a7e4e54f22bda90b08d2e1bffae
(cherry picked from commit 18e8674b45944237bd218d1106b7c3793fa7fba9)
1 file changed