Merge "111614464: Update the api-generator script" into pi-dev