Merge "Regenerate API after b8f53ee812b75b526c3b481b62334e45609fa70e." into nyc-dev