Merge "incidentd: Updating Settings Provider proto dump."