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

* commit '81ba3f3d296075508f905f0ddf8fed5c0fe986c7':

Change-Id: If75a73f8de68462ce7a962481ccb71dad4138b90