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