Merge "<nit> Fix typo" into sc-dev