am 2c44a28f: am d42acbd4: am acdd1496: Merge "Fix order of voicemail ringtone initialization." into lmp-mr1-dev

* commit '2c44a28f7b72c7b8644537389189c41844cd9c7e':
  Fix order of voicemail ringtone initialization.