Revert "Merge pull request #20033 from eeejay/bug-1020605"

This reverts commit 763b7f62805570b1606b8738075318020af3fa7d, reversing
changes made to e794eeb8dcb308cd7b1580717ef38e2880987634.
Bug 991949 - Cell broadcast ETWS messages show undefined

ETWS messages without a message body use a canned body depending on the
warning type.

Change-Id: I25491fd85894d334bd6a9ab63105379de495ef2a
Merge pull request #19943 from millermedeiros/1019617-week-view-am-pm

Bug 1019617 - [Calendar] Week View change sidebar design to fit am/pm on all locales r=gaye
Revert "Merge pull request #19770 from tauzen/Bug1017572"

This reverts commit e794eeb8dcb308cd7b1580717ef38e2880987634, reversing
changes made to f6b5f77d47d103c672be388082f04709ccdf7f08.
Bug 1003191 - Use mozL10n.once in the fl app. r=djf
Merge pull request #18790 from stasm/1003191-fl-ready

Bug 1003191 - Use mozL10n.once in the fl app. r=djf
Revert "Merge pull request #19912 from kamituel/Bug_1019169_byte_str_conv"

This reverts commit 0f5dc07363da7a3f27e3ad5f1f7f957265e79bd8, reversing
changes made to 763b7f62805570b1606b8738075318020af3fa7d.
Re-land pull request #19770 from tauzen/Bug1017572 since it wasn't at fault for Gaia unit test failures.

This reverts commit 4152286b9cbadaa8fe2fecfa82226e99ae41a679.
Merge pull request #19483 from gitmai/bug-1007591-sms-iac-costcontrol

Bug 1007591 - [SMS] Make SMS react upon the IAC broadcast from Cost Cont...
r=julien
Bug 998012 - Add FxA Terms/Privacy text to the system app r=alive
Bug 1019169: Fixed UTF <-> Uint8Array conversions
bug 982295 - Use new Browser API download method. r=benfrancis
Bug 1000852 - Clean up bootstrap mozL10n API use in Video
Bug 986331 - Add support for .3g2 file extension (maps to video/3gpp2 mime type)
Merge pull request #20098 from dhylands/bug-986331-3g2

Bug 986331 - Add support for .3g2 file extension (maps to video/3gpp2 mime type) r=djf
Bug 1021027 - [Flame] Investigate failure in gallery tests
Merge pull request #20042 from 6a68/bug-998012-tos-pp

Bug 998012 - Add FxA Terms/Privacy text to the system app
Bug 1019970 - Clean up connstate l10n
Bug 1021034 - [flame] Investigate failure in test_camera_flash_modes.py
Bug 999053: [FTU Ping] Handle multisim situations more gracefully when collecting network info. r=fabrice

Conflicts:

	apps/system/test/unit/ftu_ping_test.js