Merge "Logd retry throttling." into pi-dev