Merge "Remove unused import" into mnc-dev