LPS-33799

Hi Nate,

This PR depends on https://github.com/natecavanaugh/liferay-portal/pull/1095

Thanks,