Merge "Fix SuppressWarnings typo." am: 0bd7c54745
am: a155f43794

Change-Id: If228867926149f7cad9b5a479beefc45cacfe7f2