Bug 1020166 - Update IMEI tests to handle 1 and 2 IMEIs
Merge pull request #21803 from AndreiH/test_mmi_v2.0

Bug 1020166 - Update IMEI tests to handle 1 and 2 IMEIs