am: 9b8b72748c
* commit '9b8b72748c555329564577d53e96a600bf1ea99b':
Per API review, revert the API renaming CL.
Change-Id: Id802ddda4cfd858366f6cb4206a9e1110feb5ad8
am: 9b8b72748c
* commit '9b8b72748c555329564577d53e96a600bf1ea99b':
Per API review, revert the API renaming CL.
Change-Id: Id802ddda4cfd858366f6cb4206a9e1110feb5ad8