automerge
(cherry picked from commit 5f5824d78d) # Conflicts: # system-test/automation_utils.sh
5f5824d78d