Merge "Fix import order config file for Intellij." into mnc-ub-dev
am: 8c1e871ae2

* commit '8c1e871ae213897df522ba53f4a63cfc750fa38b':
  Fix import order config file for Intellij.