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