Merge "Fix typo in the IS_OMPT_VOICEMAIL field." into nyc-mr2-dev
am: 70f920fa0c

Change-Id: If2936ae00b37750362a56975ba7c42a6c30984aa