This patchset makes use of a more idiomatic structure of networkx Change-Id: Iccc4e9f0cc14cccadb2959ff8d68cd68367c4da3