Merge "Fix static analyzer warnings."
am: 5b843179ff

Change-Id: I8bb16947a6fcc156e2bbe74dbc8f27d4318f9b9d