use v2 interface

Change-Id: I12bd9e8f0dfbc3ecaccf5035e5730cb8dcb0bcaa