tree 5f2db30804a3383a6d7f1987b3edc2db06f50a8c
parent 6e22c50d7b06a6296182d9230f53b10cf5bd41b3
author Niels Egberts <nielse@google.com> 1482507131 +0000
committer Niels Egberts <nielse@google.com> 1482507545 +0000

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