Merge "Use new api-generator version: extracts deprecation info" into mnc-dev