Merge changes from topic "emergency_info_provider_related" am: d27da232b4
am: bcd6f3f841

Change-Id: I25bd51ca5600aabbf276cbf0a47260516c3ce12f