Merge "DO NOT MERGE: Register NetworkController to DumpManager" into sc-dev