Merge \\"Add more configuration state for visual voicemail\\" into nyc-mr1-dev am: fbb87a0591
am: 6b4c1e2d9b

Change-Id: Ic927f2b9a0ef6e55614bd6ea7b62793a6d10bf36