Merge "Fix clang static analyzer warnings"
am: 797da605d0

Change-Id: I5224ae1341e6442f28c044524c3d8b790873cdc8