Merge "DX: Fix tests 115, 119, 125" am: 50b3c25ccf
am: 47d5a85f8b

* commit '47d5a85f8b82542e3f1ce4ee29c48ec17d70589f':
  DX: Fix tests 115, 119, 125