Merge "Fix for NetworkInfo_DetailedStateTest"