Merge "Update auto-generated files."
am: 5449a46982

Change-Id: I165f89b9fd994a0c1ee2f248ba2c64a2e60d98af