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

Change-Id: I81f748633e6bedccad71095e75a968fcd354ea59