The diamond operator isn't supported on google3 Android projects. Change-Id: Ie7298b051330bb2cd32426d4c537882faa2f8ebd