Remove redundant type arguments and type cast

Change-Id: I85be0f1fcceb51333d25eeca51cc53f842cef860
5 files changed