Fixed a few earlier review nits

Change-Id: I7669f64ca2e358361490d8fb3615cc21ee4c7b9d
1 file changed