LPS-43171

Hey @shinnlok,

Attached is an update for http://issues.liferay.com/browse/LPS-43171.

NOTE: @samuelkong had some notes about the original pull request in https://github.com/jonmak08/liferay-portal/pull/568.

Please let me know if you have any questions.  Thanks!