[FORWARD PORT] LPS-49937 autogenerated

This is a forward port of https://github.com/sergiogonzalez/liferay-plugins-ee/pull/100