Merge "dx: Fix missing critical edge classification" am: 04d126d57e am: af2735e9e6
am: 60bacea0b8

Change-Id: I32a1212815bbea0c812d1f288278e9d0e054d3b3