Fix clang static analyzer warnings. am: 1f80f8a13e am: 4c545e11d3
am: 6198acbd23

Change-Id: I8694103baeff7d446765ea89c135b5147b445e16