Fix build, updates current APIs

Change-Id: I34deb72207e6eb7c37dd57d781a66582cef62b95
1 file changed