Merge "Fix import order config file for Intellij." into mnc-ub-dev