Syncing between google internal and googlecode

First commit intial sync commit