Use suppress/restoreWarnings()

Instead of @

Change-Id: I0c422e452636ae1af664b24c0859d038592e0e8a
Merge "Use suppress/restoreWarnings()"