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

Change-Id: I96c616af60e33c5fa30034ad3dd7954e5e1bcf26