reintegrated unpushed google code commits