Merge "Add lint baseline to address NewApi errors"