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

Change-Id: I56acf201a8d64ede7c5ccf40bac358b9e59c7568