Update API

Change-Id: I9fa5660321cae7312f63ce359d67d9f9276e4d72
Merge "Update API"