Merge "dx: update run-test script and expectations" am: 5a49fafa am: 6e6df526 am: a818817e am: 91d7827f am: ebdba5da Change-Id: I2039bd3a8ed13bb5f60cc91fb2d48f039c5a8adc