am e5f2cfb4: Merge "Remove ambiguity around Parameter class on OpenJDK 8"

* commit 'e5f2cfb43e14d4e32f145102ae398003e0ed5927':
  Remove ambiguity around Parameter class on OpenJDK 8