Merge "Move couple of intellij libraries to project level." into mnc-dev