Address review comments #984

Job	Run time
StaticAnalysis (17)	5m 22s
Clients / UT & CodeCov (11)	12m 19s
Clients / UT & CodeCov (8)	12m 2s
Clients / UT & CodeCov (17)	10m 43s
Integrations / UT & CodeCov (8)	2m 2s
Integrations / UT & CodeCov (11)	2m 1s
Integrations / UT & CodeCov (17)	1m 35s
ValidateGradleWrapper	11s
Internal / UT & CodeCov (8)	6m 54s
Internal / UT & CodeCov (17)	6m 14s
Internal / UT & CodeCov (11)	6m 43s
Controller / UT & CodeCov (17)	5m 44s
Controller / UT & CodeCov (8)	6m 10s
Router / UT & CodeCov (17)	4m 1s
Controller / UT & CodeCov (11)	6m 14s
Router / UT & CodeCov (11)	4m 19s
Router / UT & CodeCov (8)	3m 54s
Server / UT & CodeCov (17)	9m 30s
Server / UT & CodeCov (11)	9m 30s
Server / UT & CodeCov (8)	8m 54s
StaticAnalysisAndUnitTestsFailureAlert	0s
	2h 4m 22s

Provide feedback