Merge "Reduce number of lint warnings"