c9bc4e2d2b
Backport https://codereview.appspot.com/111320044 from Go master library. From-SVN: r217110
Backport https://codereview.appspot.com/111320044 from Go master library. From-SVN: r217110