Update APIs, fix build am: 3b7d9076ef am: fb3e6cdf3b
am: 704eb965fb

* commit '704eb965fbcfb0cdd84bcee390f475e4b0c645d5':
  Update APIs, fix build

Change-Id: I98dafda2ca66e30371593033f7e69cf5e17feaa5