Merge "Fix Dx tests."
am: af28c47186

Change-Id: If641d6973d6846c766bbafd63e57420f4f330081