Bug: 148370985
This reverts commit be9ba356aa.
Reason for revert: The change used <>, which is supported in Java 9 but not in Java 8.
Change-Id: I06304dead0a54b33b37d6661f9446cc797785bf4
Bug: 148370985
This reverts commit be9ba356aa.
Reason for revert: The change used <>, which is supported in Java 9 but not in Java 8.
Change-Id: I06304dead0a54b33b37d6661f9446cc797785bf4