Sync from internal google via Moe

A set of internal changes synced to open-source.