Merge "Fix clang static analyzer warnings."
am: 411414c916

Change-Id: Icb0a337935cdcdccd5d66702188e7e53cf319c35