Merge "Fix clang static analyzer warnings."
am: 9696b02782

Change-Id: Ic5c704bd3cd4d9d9d75c18283ae39d3903a4fa5a