Import v2 API
Han-Wen Nienhuys authored
Change-Id: I811c6a070bfdc3582da816f302354f4a7516beab
e9498b6b