Merge "Ensuring previous sounds are named correctly Bug: 5416299" into ics-factoryrom