Merge "Fix SuppressWarnings typo."
am: 0bd7c54745

Change-Id: I43a9bea860188f55292dcbeac38bf026d87fa634