Fixed style and typos

Test: Build
Merged-In: I1a35436181909c83b5b611193f31501ae8be42e0
Change-Id: I1a35436181909c83b5b611193f31501ae8be42e0
(cherry picked from commit c262c642a997a6bc8791113ddff803faaa78d929)
1 file changed