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

Change-Id: I5adffc4469a541e85265f2ba79eb6dba0cd09eb7