Sync with google3 version.
am: d3bc59a622

Change-Id: I9d9e34660a34331c372cf7b0608c9d8c461fc437