Merge "Fix a few eclipse-reported warnings"