Merge "Emergency location notification text must be in the correct language" into qt-dev
am: 1c60a7c773

Change-Id: I368b0e0d9d4000c3ffb37db148dd934f35d7cda8