automerge: 5ff829bf -s ours * commit '5ff829bf': Revert "Telephony: Voice mail notification related changes"