Sync google3 changes.
am: 26e8c2edb5

Change-Id: I90410a201a2b8610f4b5e85202ad0b6165eacd8b