Merge "Preemptive imports to avoid conflicts from AOSP"