Merge pull request #10929 from lissyx/bug892520

Bug 892520 - Ensure serialization of upgrade path
Bug 889245 - [Call log] Display emergency number or Voicemail string