Merge "Address nits from ag/13702356" into sc-dev