Issue #3527142: Back port composer updates to 10.5.x.
Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
@@ -14,7 +14,7 @@
@@ -22,21 +22,22 @@
@@ -61,7 +62,7 @@