Merge "dx: Test enhancements"
am: 174674c989

Change-Id: Ie917736a1c261c274f83c40e38aa8cec33415e13