Merge bug fix in test to release

svn path=; revision=84449