Cleanup some static analysis warnings

Change-Id: I8fd8bebbdf96976ddd2e1c1511edda2836f3fc93
Merge "Cleanup some static analysis warnings"