Fixes nits, codestyle and an issue from review 9913.

Change-Id: I378eb937d49f3d91b8e2b9a8647aa9c82a90dd15