Merge "CodeCleanup : Replace StringBuffer with String" into cm-13.0