am 4b7a66a8: Merge "Pass string key when updating ringtone." into lmp-mr1-dev

* commit '4b7a66a8b9328f19f77eecc62c124abe3a8d94a9':
  Pass string key when updating ringtone.