Down-integrate from internal code base (C++ maps support).