Small fixes.

Change-Id: Ia949ed0bc93edb78d0b029f3bd3dd584e9a00dc8
(cherry-pick from commit f0cb397a9e204c86be7730f94ae5fba84d88f89a)
1 file changed