Use config=v1
as this is r1.15
branch.
#36190
+2
−2
Merged