Checking this patch in for Chao Yu <chao.b.yu@intel.com>. r=hwaara, sr=mscott, a=dbaron git-svn-id: svn://10.0.0.236/trunk@101970 18797224-902f-48f8-a5cc-f745e15eee43