Merge "Updating incident tests based on proto cleanup." into pi-dev