Merge \\"Cache old VM ringtone name to avoid stutter in settings dialog\\" into nyc-mr1-dev am: 0c34424c65
am: 3a63b83bdd

Change-Id: I00e6adffff376168d0634f5f014104070ccb886f