Merge "Fix new NewApi lint warnings"