Remove refernces to V1 API, as V2 doesn't exist anymore.

Also ran formatter on modified lines.

Test: Refactor only, CTS tests still passing.
Change-Id: I1309cfa8e9e731d3450c13d96038e6b5d53a12e1
3 files changed