Update APIs, fix build
am: 3b7d9076ef

* commit '3b7d9076ef1cc001bbfb85471621612dfcb95ff3':
  Update APIs, fix build

Change-Id: Ia9abab8d7b4a354af11864b337dee866540787a5