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

Change-Id: If7bbccc75a219eb484d2dfe5ded4fd26d702f6a6