Merge "Suppress false-positive static analyzer warnings" am: 0c89aaec1f
am: 2ee27bfd0d

Change-Id: I3a66607388d54bc5faec076baa2280dde9bddb01