Updates to generated files for 4.2.1 release.
am: 3545247796

Change-Id: Ie8be99d154b8bc7694c14c95e7145a2d52236b07