LPS-36663

Resending as you requested here: https://github.com/brianchandotcom/liferay-portal/pull/12280