Merge "run-test: Fix bash warning with DESUGAR=false"
am: 2cf5659018

Change-Id: I30abecbc31724d69eeabb5631154b50a4c6a8890