Merge "Fix clang static analyzer warnings."
am: 94ae35de6c

Change-Id: I69421f7b3f8ae07b4e9f40006c33957defcbbc7d