Merge "voicemail notification settings cleanup" into oc-dev
Chen Xu [Tue, 9 May 2017 17:49:06 +0000 (17:49 +0000)]

Trivial merge