Merge "Address comments from API review."