Merge "Suppress Api Lint errors on shipped APIs" into sc-dev