Re: Backported r185231 from trunk. (issue 6878045)

[xur]

Look good to me. Please check with David if google-main branch is
currently opened for check-in.

-Rong

https://codereview.appspot.com/6878045/