r=javi, sr=mscott Checking code in for ccarlen. This is to get profile switching working with PSM 1.x git-svn-id: svn://10.0.0.236/trunk@86371 18797224-902f-48f8-a5cc-f745e15eee43