Merge "Organize Import to conform to Checkstyle guidelines."