Merge "Remove voicemail instruction text" am: ed022b5193
am: 2101c6d2e1

Change-Id: Ib0c42696cbe690361357d45f371edfb5135206a2