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

Change-Id: Ib15f828ab3c1c3cc5a4068886c7235ca15cddaec