Resolve #3525988 "Return types fix"

Ankit Pathakrequested to merge
issue/acquia_optimize-3525988:3525988-return-types-fix into 1.x

Closes #3525988

Merge request reports