Merge "DO NOT MERGE - Fixing capitalized ringtone metadata only" into gingerbread