Merge "dx: workaround a verifier bug"
am: efc11dda34

Change-Id: I484e0c3641494e4390e02d2ee61270231a8bf9cd