Merge "Fix memory leak in Ringtone" into cw-f-dev am: 7777b3d1d8
am: 75e5620bb4

Change-Id: I17ed55673947c7743bf0fa812ae9421dc5a5d0b5