Merge "Address comments from API Review." into pi-dev