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

Change-Id: Ic6e68af1bbcae7b3011940dbc74b7fb163ec7aed