Merge "Revert "Suppress a static-analyzer warning""
am: dabfdafb81

Change-Id: I83a3710ab594f3be20e3cfd8f0d16e1e047a8178