Merge "Remove java.lang redundant imports. Taken from sonar."