Merge "Remove ambiguity around Parameter class on OpenJDK 8"