Cleanup another round of analysis warnings

Change-Id: Ic8eb1cebe50ba0b9635ed308e1e4a00e7cf465aa
Merge "Cleanup another round of analysis warnings"