Merge "Fix static analyzer complaints"
am: a3bde81205

Change-Id: I39f7b56c6abc0398cd517eef174b0620dbc50caa