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

Change-Id: Ifa3e4010ee1ce152f17bdc14f4e73d647c05a76a