LPS-49035

Worked w/ Ray on this. Fixes issues for OpenSocial.