This is mostly to sync up with some changes from Google's internal
repositories; it does not affect the open-source distribution in itself.