Merge "Cleanup static analysis errors"