Follow API changes.

Change-Id: Ieb1df7fc0708f22aae3d851f74ade1343eb44e08
17 files changed