LPS-46689 Don't pass null to the app server
LPS-46689 Source formatting
Revert "LPS-46689 Source formatting"

This reverts commit 9ea220e883ca6de99c12820a5d31a97a9d1d6271.
Revert "LPS-46689 Don't pass null to the app server"

This reverts commit ad384c8d3c7ba38283c0d74535e7e14f14daaae1.