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

Change-Id: I86eb798428f5a0823fce8b1d95278d2f68760b8b