Merge "Fix b/270656372 unit test failure." into udc-dev