Merge "Address the API review comments."