Merge "Suppress more error prone warnings that are false positives"