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

Change-Id: Ia92cf80d1bf9460006866e42932bf043b4cbd163