Merge "Remove identifier that causes warnings under OpenJDK 8 compiler"