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

Change-Id: Ia93806a74ab5c7d4ad49a0befe26638f0428af80