Merge "Moved implementation of ConvertUtils to cpp file."