Remove unneded supressWarning annotation.
Revert "Remove unneded supressWarning annotation."

This reverts commit 50261219cec6021b75b294e5152c4f9530f31d11.
Update the patch to use TypeReference to maintain collection type.