Merge "Fix build" into mnc-ub-dev