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

Change-Id: I22741b5a1f7e08afb0d62e7f8894dc021e626a36