Merge "Skip warnings for some unresolved references." into mnc-dev