Merge "Revert "Add CTS to verify CellInfoNr method""