Merge "Remove use of deprecated wfSuppress/RestoreWarnings"