Merge "Fix NetworkInfo_DetailedStateTest"