Change datatype for rawContactId to String

Removes a lot of String.valueOf()