Merge "Fix clang static analyzer warnings." am: 94ae35de6c am: ecafd27df2 am: e4b8f60650
am: 7794bb5e3a

Change-Id: Ieafe4f26a33ed723fe59c447e0530fa81852bc72