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

Change-Id: I226fe0bae02d044ca3f733594d0a98bde2b57236