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

Change-Id: I583722ca6ac52499d027f6660393647e6051a4c5