Merge "Address API review comments"