Merge "Add flags to emergency info intent" into nyc-dev