Merge changes from topic "emergency_info_provider_related"
am: d27da232b4

Change-Id: I4ccfa0af34416b773f701b8dde62ec195d87f05f