Merge "Rearrange imports to avoid IDE from auto arranging everytime" into mainline-prod