Merge "Show voicemail error messages for NUI"
am: 328494b2e7

Change-Id: I417682ff3c8fbf5cceab6c48bafc7bfcd7b52c3d