Fixes for google3
am: 3e59eb1b07

Change-Id: I32e515ddb9c531228a7724cc2e5bab764cc9ee43