Merge "Replace strcpy with memcpy." am: bb115bac41
am: 16951dcb54

Change-Id: I72b660c6c0b56afa4f713ee2a1d17c53d9efd98a