Merge "dx: Test enhancements" am: 174674c989
am: 4412cff44d

Change-Id: I57627dec4caad82220badd3574506f4bc835f838