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

Change-Id: I02cdf2b3c550d170b11acc450af9adc238431845