Fix generated files after upstream sync.

Change-Id: Ic4b801cf500ac17c4f7ddbff896edf318e373fcd
7 files changed