Bug 917828 - Remove the phone number assert in /settings/test_settings_device_info.py
Merge pull request #12300 from teodosia/update-assert-device-info

Bug 917828 - Change the phone number assert in /settings/test_settings_device_info.py to assertIsNotNone in v1-train
Merge pull request #12245 from EverythingMe/bugfix-903405

[Bug 903405] [E.me][L10n] After changing language, the description in e.me should change [r=crdlc](cherry picked from commit b3d003e1c92f6bd685be275b57f17d186ffcaaa7)
Merge branch 'v1-train' into v1.1.0hd