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

Change-Id: I188103205120ba6b87b1a64ef47bcd2835f26deb