1e1c24bed2
Forgot to do this with previous check in. Now that calculateLength() has been fixed to match the actual encoding (ie, doesn't support single-segment EMS), test case needs to be updated. Fixes b/2244483