Sync files with autogenerated ones

Change-Id: Iaab1e8994cb41ffd8022d369378dff64524f2f5d