Update APIs, fix build am: 3b7d9076ef am: 81ba3f3d29
am: d6af2d2dc3

* commit 'd6af2d2dc3fab17c081c82a019773f883bea1f93':

Change-Id: I19fd0d63be1fcd1837727f5562024f8b2611f9aa