Merge "Change test to use public stop reasons." into sc-dev