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

Change-Id: If020cc3427f80cbaf09573a3ed03738c8130ddfd