Merge "Update to api-generator 22.9.4."
am: fd1550eb4d

* commit 'fd1550eb4d1abe4fc812f346723764708811f2e7':
  Update to api-generator 22.9.4.