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

Change-Id: I70a832b6d7372bc19dfe4a58f3e121b8b7ecdca5