Merge "Fix static analyzer warnings" am: 5e9fc32d46
am: 2cf2cc0cd6

Change-Id: I70682457a0ee2c7dceea85a0e7e2a517f5d23592