Merge "Fix build break 2" into mnc-dev