Merge "Suppress bogus static analysis warnings." am: 9d431ceffa
am: ed7b73a536

Change-Id: Iea0bc3117d4d1a6c2a6dcea562554249836e77ee