Merge "Fix typo in the IS_OMPT_VOICEMAIL field." into nyc-mr2-dev