Merge "Add lint baseline to address NewApi errors" into sc-dev