Updates from Google internal repository, mostly cleanup.