Merge "Fix build on mnc-ub-dev" into mnc-ub-dev