Merge "Deprecations are warnings not errors" into mnc-dev