Merge "Grant.java-removing useless assignments"