Merge "Fix typo in the IS_OMPT_VOICEMAIL field. am: 57365441d4 am: e696c3d911"