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

Change-Id: Ica8a4b2e224e278308e9dca377751e462be4ae6d