Revert "Revert "Fix dx test 034.""

This reverts commit 847b222d87865371590ff7587ae1a7de8823ee47.

Change-Id: I5587003b33c674465af1643e484de9a589eae1d7
Merge "Revert "Revert "Fix dx test 034.""" into kitkat