Merge "Add @SupressLint to get around incorrect warning."