update api code

Change-Id: I70e7636cdfcbc5c5195e5a91b5cc7a401b6c9d72
Merge "update api code" into dev/experimental