SYNC-1208

Resubmitting PR: https://github.com/brianchandotcom/liferay-plugins/pull/2753.