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

Change-Id: I0b9180603066912a9236f671cac27dc3a7325a9f