Merge "Fix Mac build." into mnc-dev