fix api bugs which are not used in UI

Change-Id: Ia4c719dda4ff47e31e22b0ce7c5744e8b5088670