Merge "Use suppress/restoreWarnings()"