Merge "update-support-api to exclude deleted classes" into mnc-ub-dev