Merge "TIF: Replace StringBuffer with String" into mnc-dev