Merge "Add a test for b/177780499" into sc-dev