Merge "Fix static analyzer warnings" am: 19921b70fe
am: 25c66b014d

Change-Id: I3ecbe85d3a263d929ab45b48bd57a769deb203e9