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

Change-Id: Ic5d08297f745932edaaa2948ca3c207e8c6b890e