Patch by Justin Dolske. bug=342231 r=myk git-svn-id: svn://10.0.0.236/trunk@226033 18797224-902f-48f8-a5cc-f745e15eee43