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

Change-Id: Ice7a2f855e881d11f72f61d021b4fa828db5ddb0