Merge "Refactoring of graph linearization and linear order." am: 78c6fefdb9
am: ac2065c9a3

Change-Id: Ic2fc38ace9dcb4c0ac0c1e27ba79f34611c98373