Merge "Fix nit from ag/13715126" into sc-dev