LPS-37922

Ray, you can help me review this. Thanks.

It should be related to http://issues.liferay.com/browse/LPS-29329.

This fix follows a related fix in http://issues.liferay.com/browse/LPS-34848.