Merge branch 'open_source' into google_internal