Fix Nick's nits

Change-Id: Ide7925e7ad328f0343d444d63ff72f1a26206d4c
1 file changed