Fix backward compatibility with single network engine definitions.

Change-Id: Ib022b5b3bfdac630312c97b06ca100b0ef4a1673
30 files changed