am 09063db7: am ecd3df97: Fix generated files after upstream sync.

* commit '09063db71ac681ba7d087d14242977e51ad0e6d0':
  Fix generated files after upstream sync.