bug=155866, r=kyle, sr=jst, a=asa git-svn-id: svn://10.0.0.236/trunk@125356 18797224-902f-48f8-a5cc-f745e15eee43