Merge "Add regression test for b/35305951"