Merge "Revert "Suppress a static-analyzer warning"" am: dabfdafb81 am: 654efeb3d7 am: 25cab90e36
am: 5cd13ecc7e

Change-Id: I995c543f970e430e4c43af39df1c0f97cf54a2fd