Merge "Remove number of Wake Kills, it is safe to change proto numbers since nothing is being used now."