- Use Collections.emptyEnumeration() which is available in Java 7,
rather than the Collections.enumeration(Collections.emptyList())
workaround that was used for Java 6 compatibility.
- Add type specification to prevent "unchecked conversion" warning.
- Remove @Suppress annotations that are no longer necessary.
Change-Id: Iba4b61330d5ca8a822b8121fe46fb20418e79347