am 168a4a36: Merge "Fix dx test 118-find-usages"

* commit '168a4a3690bb4f5805d53b7b26ad55594dfaaf40':
  Fix dx test 118-find-usages