Merge branch 'open_source_contributions_cherry_picked' into google_internal