fix some api

Change-Id: I7179a115c9ed3e7d3473c1761df1bb4f2bf3711e
7 files changed