[automerger skipped] Fixed style and typos am: a943540450 am: e17b1111ba
am: 725617c204 -s ours
am skip reason: change_id I1a35436181909c83b5b611193f31501ae8be42e0 with SHA1 c262c642a9 is in history

Change-Id: Iabbc96fac125c3ffc326bc1c30e92b1af7ceee06