Update code formatting

Change-Id: Ife12c8f2286572638f702f4eb3b746d8a93af68c
Switch incorrect style override

Change-Id: I7c69cd5f9aa8bf5bd9e5dfa5210b98bb7ad81621