Merge "Revert "Fix build."" into mnc-dev