Fix Eclipse warnings Remove redundant specification of type arguments by using diamond operator. Remove unused import. Change-Id: I4a4c9849b93c4f237facbfc11b10f5fbd0867a0c