Merge "Update counters for session encryption to start at 1."