Merge "Adding additional variety to sound set 7" into ics-factoryrom