Merge "Backport: Work around a type inference change in javac"
am: a728081e33

* commit 'a728081e33734f0f1b1260a98d6e6292dfcbd66c':
  Backport: Work around a type inference change in javac

Change-Id: I2aaff9e7d36f9f3c045815738489ae12239cde8a