Merge "Fix static analyzer warnings." am: 9c69c41b95
am: 4cfb0f020f

Change-Id: I127bbf30a44342e2464a29c7b1793861f3c44931