Merge "Moving gsm.NetworkInfo to OperatorInfo"