Merge "incidentd: cleaning up settings.proto" into pi-dev
am: 41b5ece135

Change-Id: Ic1fd23d00921e373219701623175924fe09d618d